From 191b4408c9578f83f9757303ee16d2bf315a71c6 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 9 Sep 2019 20:16:44 -0500 Subject: [PATCH] Don't override the upstream EPLA packaging key anymore Emacs 26.3 has the correct version. This reverts commit d1de1246503b55518a912694704fd5e509e01d3a. --- debian/etc-package-keyring-new.gpg | Bin 2069 -> 0 bytes debian/etc-package-keyring-old.gpg | Bin 999 -> 0 bytes debian/rules | 12 +----------- debian/source/include-binaries | 2 -- 4 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 debian/etc-package-keyring-new.gpg delete mode 100644 debian/etc-package-keyring-old.gpg delete mode 100644 debian/source/include-binaries diff --git a/debian/etc-package-keyring-new.gpg b/debian/etc-package-keyring-new.gpg deleted file mode 100644 index 490dee41a92eaa4afaade953da7c2a61ee303a50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2069 zcmaLYdpHw}9tZH<+!b@pZRRrO+H%QlmCItu5+YmUb(>8w4WqZ|&=Q84$jBunw zqo()bdPs-X54VxiyY5QJ9fQk_!9+K z<@1j+HR9`lGURF54Ohsum*OP0KkLi^%vo<(z++C%g{I*!UQujmHCY2^kg>-rxqvxa zGU}Gb*de)OH+H}A6Rm}DXAN01rmK;!(!OYt_~?h5Woafs?#a?d)L|fC_E|#PE!-IX zybQXsWS`Y)1UQXpNn;0i{UD1OY7&y16gR*O^LTm)b@O}93b(0gu% z@A7~%S~gY-^D5X%Y(zI_L90$SxUow3erfTVnDZVhC?cQN&)NKeDML@~Eu^EORb7@o z85Q;Gn8EpKwNmSvlwtjiOiJf;yTQQYEpv0*#`PZr8TC)K2IXHNL3upz^7Ecr&^C;R z+v)=ThLCqe&v9xq0m*qVJ5XSwp>ccvCx*kz5S!;1Zr@_OP92D_V0NBWJpz@beS1rNt-TjTsSi|L<(p*Q zD0W`DY`%goO&1!-zMAV3AhRohFmSm|+&5IVF`Zyhs4~>-Xl2GeyBd=Tn?V@z9__PL zX=ph~jNVKgk~PVBz_&6-6r-~~GhWuZb_^+5)7k64+fP}v8$$_isJeagii{w3;4T%7 z(PVHGcC{dE&tTZDm%L^*$0*O)IIk6Ml$Y|1Wj7-K=s)vM`MTY^nLN|IVUX3((ccX_ zB@l6MT^m_(>Im$eg;v!o&Q3Xz>%!|h>20mSQXg5$iPmRyZQN7(_w17xJIoLdslT(E z6lXH#FmSWXKR=hyIU*1^`Wy&`@AW(A0S}5JQ{$*)xCfa;O@SlrP&*tf;Am3(@yO(# z8~48kTQZeyo0vr2oy&o!|Gcr?T1F5d#u^~ePFcyoPqg^>%bdyR{9GXeB6ic`Kzd*q z1%+5(ri_w;yc|eYQ(i$)2?Wssfq@_x5Tu<6P*hO;J5sO+kOoGh+vzVCly2L6d40(D zVZy|HTZ@=j`{}Xb$Ns+3k9q)U5G|K%)5~1FTc948c`dmnlRC1PVK=Z_Epv2O-zl7R z33v`d?4~FJl>x&1dUJ-@;lmWT!GExVlFrfyOs?ot%Idn()^yb8I9x~17GP8jkH;o% zlFIJ;45(68!rSs1^^rtTo!z!-)Sb!wd4=Vb*Vdz=ljtestNJIm=BOy1N$E7}Tk!O7 zFFW)*{sdKoAVwfK_;TSl+9`w0Y{GEs)3A1PFlZ+C1BN2rq>8qd3_OdBVeo}Hgja)eF=w`NfNH9OztKTl7c`!fvs0X1>3 zzK6|58$ksJ2~%ii817!q)rowG1t;z9x+W^Aq0*8&6ze_oF8EJ}v=u&G#)&F68>zO> z?hpA!Qh!G43WeT`n=6}e>*?uvYxlo=r5yXOFJ*^c`T9FjrK+^)6r)#K^sxB4F$WeA_BO(oklnMB zS1Cs{K{(H+FdN3KAosg7Zc#bN{9?du2=suW^{&uh^O1ysDu?J{R&2?DPv03ke`|93^e7YT34b z7(RBkA{ZICBx;3Dn9PDcCqPiW+ijy6I!@%{As#kbFS5M!YD=56zSu?DlSuVPiOwcw z0+t}}o1 zeEGS=1j7e873T7%K)`}qIuNnP{x>4UtLXEl1iTjeSt^2jzB3(@v!TDpEzd;3uCk(= z8z>F%0qVrqpCDWJvZifZOj!AtNLe*rwg{TJ`JALM#aVIp!mVwU{Ozwo8g`~(sa7%> z-Z0d;oW26&cJqnN5@FbgcWbGu(e7vgokxC{5?tU>m?(h;{W=7r+w*ddPlNvXW+(pJx=iF{fa8{*jK@6&5-E;Nd6=ar7(xY2|E1q zFQ<}PY3zpPs8-ikO_L1i-`Ysh9xEm=qILOYt2*h4=vuIQ9%d)St_4` zeBg&x9x_6m!L$$SNkx}REJo?@cES)k2&)C-3cZ=0C-GUAe99dL-Qvi!D2AK?9s`;! zY4|XPB6V6RkPpwTH7h2Mh4y5C9^WM&vc*X*52vttTx0%r&jurh!m}$UC6hda?|a*% zI=s&dEOn3kc{AK8xgrr-<8B(r+;?RsTl@Xn3{Ibr(&`b^3;SL^4FrvM3xjzh!A7)ilhmm`{s{TD{V=v@S_Jo`}D;W9L(QE0Ue=tjLYw2JwgX~ovCd00RWby0OiT6o#*&9KcJZt&YvWX Va-Ur7=MI9D^M5%6S97oe00W!$*(Lx0 diff --git a/debian/rules b/debian/rules index 5e5433beae6..b50b1615ac7 100755 --- a/debian/rules +++ b/debian/rules @@ -314,15 +314,7 @@ override_dh_autoreconf: override_dh_auto_configure: debian/stamp-configured: $(autogen_build_files) - # If the deps for this target change, start over. - # When the "new" keyring is obsolete, update - # debian/source/include-binaries. - if test "$$(sha1sum etc/package-keyring.gpg | cut -f 1 -d ' ')" \ - != 5eda21f010a2d246359efc6450830ac3d500760e; then \ - echo 'Unexpected keyring hash - is it obsolete?'; \ - false; \ - fi - cp -a debian/etc-package-keyring-new.gpg etc/package-keyring.gpg + # If the deps for this target change, start over rm -rf debian/build-src debian/build-gtk debian/build-lucid debian/build-nox mkdir debian/build-src cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') debian/build-src @@ -567,8 +559,6 @@ override_dh_auto_clean: $(persistent_autogen_files) override_dh_clean: $(persistent_autogen_files) dh_clean - cp -a debian/etc-package-keyring-old.gpg \ - etc/package-keyring.gpg rm -rf \ debian/stamp-* \ debian/build-lucid \ diff --git a/debian/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index 3549d049115..00000000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1,2 +0,0 @@ -debian/etc-package-keyring-new.gpg -debian/etc-package-keyring-old.gpg -- 2.30.2